From: Ewan Mellor Date: Thu, 22 Mar 2007 16:32:18 +0000 (+0000) Subject: Add VM_metrics.start_time, and use this to implement xm uptime through the X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15277^2~28^2~7 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=7af644b697df88b87e86cd3800a26c6a84e2c960;p=xen.git Add VM_metrics.start_time, and use this to implement xm uptime through the Xen-API. Signed-off-by: Tom Wilkie --- diff --git a/tools/python/xen/xend/XendAPI.py b/tools/python/xen/xend/XendAPI.py index a67744e4ad..480bf66b1c 100644 --- a/tools/python/xen/xend/XendAPI.py +++ b/tools/python/xen/xend/XendAPI.py @@ -1592,7 +1592,8 @@ class XendAPI(object): 'VCPUs_utilisation', 'VCPUs_CPU', 'VCPUs_flags', - 'VCPUs_params'] + 'VCPUs_params', + 'start_time'] VM_metrics_attr_rw = [] VM_metrics_methods = [] @@ -1623,6 +1624,9 @@ class XendAPI(object): def VM_metrics_get_VCPUs_params(self, _, ref): return xen_api_success(self._VM_metrics_get(ref).get_VCPUs_params()) + def VM_metrics_get_start_time(self, _, ref): + return xen_api_success(self._VM_metrics_get(ref).get_start_time()) + # Xen API: Class VBD # ---------------------------------------------------------------- diff --git a/tools/python/xen/xend/XendVMMetrics.py b/tools/python/xen/xend/XendVMMetrics.py index 94a9c3205e..217d9c2096 100644 --- a/tools/python/xen/xend/XendVMMetrics.py +++ b/tools/python/xen/xend/XendVMMetrics.py @@ -113,6 +113,9 @@ class XendVMMetrics: else: return {} + def get_start_time(self): + return self.xend_domain_instance.info.get("start_time", -1) + def get_record(self): return { 'uuid' : self.uuid, 'memory_actual' : self.get_memory_actual(), @@ -120,5 +123,6 @@ class XendVMMetrics: 'VCPUs_utilisation' : self.get_VCPUs_utilisation(), 'VCPUs_CPU' : self.get_VCPUs_CPU(), 'VCPUs_flags' : self.get_VCPUs_flags(), - 'VCPUs_params' : self.get_VCPUs_params() + 'VCPUs_params' : self.get_VCPUs_params(), + 'start_time' : self.get_start_time(), } diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py index af5adf7ff4..686166fab4 100644 --- a/tools/python/xen/xm/main.py +++ b/tools/python/xen/xm/main.py @@ -709,7 +709,8 @@ def getDomains(domain_names, state, full = 0): 'memory_actual': int(dom_metrics['memory_actual'])/1024, 'vcpus': dom_metrics['VCPUs_number'], 'state': '-----', - 'cpu_time': dom_metrics['VCPUs_utilisation']}) + 'cpu_time': dom_metrics['VCPUs_utilisation'], + 'start_time': dom_metrics['start_time']}) doms_sxp.append(['domain'] + map2sxp(dom_rec)) doms_dict.append(dom_rec)